bitkeeper revision 1.994.1.2 (40d7eea14_TQGNAaoZR7aBKoQwz4xQ)

Fix nonpriv Linux build.

diff --git a/linux-2.4.26-xen-sparse/arch/xen/config.in b/linux-2.4.26-xen-sparse/arch/xen/config.in
index e602de8573f926000bf88225b6f66e774d397a03..cd1a2278aa45a94951e0df00c4bcf3538f558d34 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/config.in
+++ b/linux-2.4.26-xen-sparse/arch/xen/config.in
@@ -20,6 +20,10 @@ endmenu
 # The IBM S/390 patch needs this.
 define_bool CONFIG_NO_IDLE_HZ y
 
+if [ "$CONFIG_XEN_PHYSDEV_ACCESS" != "y" ]; then
+   define_bool CONFIG_VT n
+fi
+
 mainmenu_option next_comment
 comment 'Code maturity level options'
 bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL

diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
index 8a9fdf2411d1031e9eb012184d08dad58a24dd1b..7f3b2f632533cdc28fcf48238ca912a350264494 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
+++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
@@ -266,8 +266,7 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # Character devices
 #
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
+# CONFIG_VT is not set
 # CONFIG_SERIAL is not set
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set